Merge git://git.denx.de/u-boot-socfpga
authorTom Rini <[email protected]>
Sat, 29 Jul 2017 15:44:08 +0000 (11:44 -0400)
committerTom Rini <[email protected]>
Sat, 29 Jul 2017 15:44:08 +0000 (11:44 -0400)

Trivial merge